Merge commit 'xanxys/master' into fix-some-bugs
authorAlex Crichton <alex@alexcrichton.com>
Mon, 11 Aug 2014 05:07:15 +0000 (22:07 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 11 Aug 2014 05:07:15 +0000 (22:07 -0700)
1  2 
tests/tests.rs

diff --cc tests/tests.rs
Simple merge